◊ refactoring